Fix the merge!