updated straight line pidgeon
merge