started object property
fixed conflicts
seed file changes
merge conflict