Update to new tip form
Fixed conflict