Ignore generated files
Fix merge conflict