deleted conflict markers in index.html