comments modification
resolve conflit comments