Fixed git not merging