Fixes for git conflicts and for mac