-s ours resolves conflicts apparently