Error: you are not allowed to revert a merge