some styling
conflict home resolve