GIT MERGE SINGLE FILE