Fix merge conflicts still