Fixing bad rebase on my part