adds item,invoice,transaction (with corresponding repos) and updates merchant (all tests passing)
resoloves conflicting files