sotyr 2 added
fix conflict