Better debugging
Add update_row_in_database method
Add new test for conflicts