Stemming
conflicts resolved