edit conflict1
resolving conflict