[EDU-3724] Resolved merge conflict