Resolving merge problems