fixes merge conflicts