Fixed Breaking Build on merge again

Left merge notation in.