removed superfluous figures from repository

fixed one conflict that was missed