OS X: Fix bundle creation after merge