Resolved merge conflict that had gone unnoticed