#424 reorganize the duplicate row bug fix to cover all update merges and be air tight with tests, also more lying to django