Merge branch into main file