commit before merge
resolving conflict