Solved conflicts!