Resolving merge conflicts between SPECS and official branches