fix some issue on feedback
fix conflict