[363] removing unnecessary merge conflict files