Remove GIT Merge Conflicts using Kdiff3 Tool