Solved conflicts from the merge