oooppps left merge conf errors