Merge Code In Git