fixes merge conflicts
fixes merge conflicts