fixed conflict_resolution_newest_wins
Merge branch '295-hand-testing' into relational-storage