Re: [rules-dev] IMPORTANT: git merges