Fixes merge issue