removing flavor directory and adding it as a git submodule from the flavor repository
merging