remove word fix from second line
made some changes to fix merge