final css for the evening
resolving conflicts