cleaning up merge issues in css