ANA-513: resolving merge problems