Splitview image
Resolved merge conflict