fixed form box
fix merge