def test_merge_conflict(self): ap1 = ActionPlan() ap2 = ActionPlan() ap1.add_redirect('test1', 'url') ap2.add_upload('test1', 'path') ap1 + ap2