add bashmarks and remove alias collisions