Solved conflicts.