fixing merge issues in css