try bflict
fix conflict