more styling
resolve conflict