fixing some merge conflicts