polished the weight conflict things / changed follow_annotation option
Merge branch 'master' of https://github.com/ehebrard/Mistral-2.0
ok