Conflicting merge