fix edit problem time bug
fix contest
merge