fixed commitmentdisplay
fixed display
fix my mergeissues
fix merge