.
fix merge conflict after yosemite upgrade on splash