[21:52:10] <funnyfarm299>	 What does the "automatically resolve edit conflicts" option actually do?