Specify which foo is which
Resolve conflict from pull
Merge commit '2828d08fa903931f676d8afffe40de51afecd97f' into 1.0