Resolved merge conflict in functional tests