ignore foo
merging conflicts