How To Merge In Git