fixing assignment4 merging with program2