added stuff to force conflict on mac
fixed conflict ugly