fixing MISSED merges