Resolving conflicts before merge #2