modified lastone.txt
fixed conflicts