removed duplicate code, updated repeat
resolved merge conflict