erease bad merge