Translated part of changes
Fixed conflict