Ignore oasis gui dir
Merge conflict resolution for gitignore