Local Commit .gitignore
Issue #41: Fixed conflict for automerge