how to handle merging branches? - Neon