Resolving git ignore problems