removing problem files from repo
resolve merge conflict