Hems jackson

Resolved merge conflicts in view file.