fixed test10.png
merge conflict resolved