Resolving git ignore problems (4)