solve merge conflict
remove unecessary test
update total_cents field to work with cents