small changes
resolved conflict
revolved conflict again
Merge branch 'tryingresolveConflict'
try resolving conflict!