changed the first line
fixed conflict in foo