Fix magic merge