text=auto
merge remote modifications