While loop now is handled
sync conflict resolved