manually fix conflicts.