Spelled out the first line
fixed conflict in foo