fixes for sk20
fixed conflict