FF: fix to avoid merge conflict