Fixed git-conflict