fixed aborted reverse errors
conflict with merging