fix for amber
resolve conflict