Mergewaypoints again