fixing pins/show merging conflict