Update conflicting .gitignore for better mergability