revoke some wrong merge