How To Merge 2 Branches In Git