fix show commitment and show team checkbox problem
fix conflit merge