removed conflict solving files...