formatting fixes
resolve conflict