fix conflicted merge