knitr 1.0 compatibility
fixed conflicts