Resolve conflicts in gitignore