Spelled out the first line
Fixed conflit in foo