maybe it will mac now
fixed merge conflicts