keep both gems on master