fixes merge wreck