Resolving merge bugs