Resolved Conflicted Source: index.html