resolve merge conflict in gitignore
remove unneeded files