cleanning
resolving conflict