refactoring
resolved merge conflict