Untrack some files
Merge changes