fixed duplicate code from incorrectly resolved merge conflict