Git Instructions on merging code from different branches