fix two merge conflicts