bflammers Resolved merge conflict