remove obsolete FIXME
fix minor conflict