Resolving merge issues.