small rebase error fixed to get it to compile again