Git Merge Single Commitment Issues