conflict resolution
gitignore