remerge lost fixes