minor chages
resolving conflict