fix conflict after merging