DJ, Charles & Greg: deleted hello method and resolved merge conflict