turned off some printing
fixing merge