language refactoring
conflict solved