warden's choices
resolved conflict with upstream