modified property access
gitignore
merge