Spelled out the first line
Fixed conflict in foo