some changes

some changes
resolving conflict

resolving conflict