Resolved conflicted files.