removed some merge conflict files