fixed silly branch/merge mistake