fix conflict in flat show