bug fix
resolve conflict