Conflict resolving
Resolve conflict
final commit