fix conflict things for merge