Removed un-merged conflicts.