[ORB-472] Fixed bad merge conflict, watermark image is now displaying correctly