some fix
resolve conflict