foo
Resolved conflict