CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result.