Bug fix
resolve conflict