New repo to deal with heroku/git conflict