loca changes
fix merge conflicts on osx