Waypoint storage expansion
Binary conflicts solved by annihilation