delete unused conflict files

link vodehar dev log on home page