remove fixme0
merge