resolved merge conflict
correcting merge conflict (tabs and newline at EOF).