Missed merge conflictS?