removing tracked files
merging