fig merge conflict 3