Second change from app #2 to common foo.txt
Resolve merge conflicts in app #2 when pulling in latest common code