Spelled out first line
Fixed conflict in foo