an easy while loop
 conflict fix
conflict fix