reversed merge of wrong files