styling fixes
resolve conflict