removes base and adds pole top
merges conflicts