Fix merge failure do to mate-overlay removing package.mask