More compiler errors.
more merge issues