removing conflict after merge and one printf