something went terribly wrong while merging... resolved