initial commit by soma2
conflict dealing done