fixes some merge issues with view engine wrapping PR.