bad merging fixed