removed merge conflict files