update gitignore and remove files
merge resolve