removed files from git
merge