spelled out the 1st line
fixed conflict in foo