repaired merge conflict for print function