resolving merge problems