try revert then merge test