resolved merge conflict between group 1 and group 3 work