add cheque status buttons
fix conflict