How can I merge my branches? - Neon