1.0.11

manage version's conflits and keep the last