Fix to work with git
Fix to work with git conflicts