factorisation de other.c
merge fixing