fixes
resolve conflict