Renvamed
Fixed merge confilic