found unmerged conflict
fixes to calling accepted! with arguments now