Fixed conflicts when creating master-base-dist