fig merge conflict 2