accepted ours files when conflict
new scripts