Modified tank bumper definitions
fixed merge conflict