Merge errors fixed

Fixed some left over code from the rebase