removed the broken reverse for now
fixed merge conflict