Fix merge conflicts 2