Fixed the most important part in git-merge-master