merged fix