One of you guys already did.

Then you moved the settler from what appears to be an original start save.
Please get both those moves the same in your save (either move the settler to same position in the one, or move the warrior to same position in the other), and play ONLY from that save.
Note, for a single turn, you should only have ONE person playing the save. That person may upload after each click, but the only purpose of doing so is to let other team-members see the save. Screenshots are better, IMO. Best Practise is for the person playing the turn to play on directly
from the save that he has on his computer... which should be identical to the last upload anyhow (unless you chose not to upload it, in which case it is more advanced than the uploaded save).
If you follow best practise, there will not be any risk of playing from an earlier save.