fixed invalid merge that reverted change