Fix the conflicted merge