Cleaned up merge mess in show file