fixes merge issue