merged conflicts in partyDAO