Merge Files with Git Merge Tool