remove these lines, it's a merge conflict. Remove unnecessary lines and re commit