(merge) fixing some merge conflicts