var modifs
merge fix