Fix contest
#Fix 2422014
remove some unnecessary
resolve conflicts