Pulled down from heroku and everything conflicted. Just checked out my local ones with: git checkout --ours .
Pulled down from heroku and everything conflicted. Just checked out my local ones with:
git checkout --ours .

Then resolved the conflicts with:
git add -u

Hoping this will let me push to heroku.

Conflicts:
	.gitignore
	app/controllers/Application.scala
	app/controllers/ReleaseNotes.scala
	app/controllers/UserGuide.scala
	app/views/about.scala.html
	app/views/community.scala.html
	app/views/download.scala.html
	app/views/gettingStartedWithFeatureSpec.scala.html
	app/views/gettingStartedWithFunSpec.scala.html
	app/views/gettingStartedWithFunSuite.scala.html
	app/views/gettingStartedWithJunit3InScala.scala.html
	app/views/gettingStartedWithJunit4InScala.scala.html
	app/views/gettingStartedWithTestngInScala.scala.html
	app/views/homePage.scala.html
	app/views/index.scala.html
	app/views/main.scala.html
	app/views/nonHomePage.scala.html
	app/views/quickStart.scala.html
	app/views/releaseNotes/releaseNotesIndex.scala.html
	app/views/releaseNotes/releaseNotesPage.scala.html
	app/views/releaseNotes/v091.scala.html
	app/views/releaseNotes/v091_094.scala.html
	app/views/releaseNotes/v10.scala.html
	app/views/releaseNotes/v11_12.scala.html
	app/views/releaseNotes/v13_14.scala.html
	app/views/releaseNotes/v15_16.scala.html
	app/views/releaseNotes/v17.scala.html
	app/views/releaseNotes/v18.scala.html
	app/views/releaseNotes/v191.scala.html
	app/views/releaseNotes/v20.scala.html
	app/views/releaseNotes/v20m2.scala.html
	app/views/scaladoc.scala.html
	app/views/sidenav.scala.html
	app/views/topnav.scala.html
	app/views/userGuide/customizingScalatest.scala.html
	app/views/userGuide/designAndPhilosophy.scala.html
	app/views/userGuide/generatorDrivenPropertyChecks.scala.html
	app/views/userGuide/invokingExecute.scala.html
	app/views/userGuide/matchersQuickReference.scala.html
	app/views/userGuide/otherGoodies.scala.html
	app/views/userGuide/philosophyAndDesign.scala.html
	app/views/userGuide/propertyBasedTesting.scala.html
	app/views/userGuide/runningYourTests.scala.html
	app/views/userGuide/selectingAStyle.scala.html
	app/views/userGuide/sharingFixtures.scala.html
	app/views/userGuide/sharingTests.scala.html
	app/views/userGuide/tableDrivenPropertyChecks.scala.html
	app/views/userGuide/taggingYourTests.scala.html
	app/views/userGuide/testingWithMockObjects.scala.html
	app/views/userGuide/testsAsSpecifications.scala.html
	app/views/userGuide/userGuideIndex.scala.html
	app/views/userGuide/userGuidePage.scala.html
	app/views/userGuide/usingAssertions.scala.html
	app/views/userGuide/usingHelperTraits.scala.html
	app/views/userGuide/usingJunitRunner.scala.html
	app/views/userGuide/usingMatchers.scala.html
	app/views/userGuide/usingScalatestWithEclipse.scala.html
	app/views/userGuide/usingScalatestWithSbt.scala.html
	app/views/userGuide/usingSelenium.scala.html
	app/views/userGuide/usingTheRunner.scala.html
	app/views/userGuide/usingTheScalatestAntTask.scala.html
	app/views/userGuide/usingTheScalatestMavenPlugin.scala.html
	app/views/userGuide/usingTheScalatestShell.scala.html
	app/views/userGuide/writingScalacheckStyleProperties.scala.html
	app/views/userGuide/writingYourFirstTest.scala.html
	app/views/widePage.scala.html
	app/views/writingJunitAndTestngTestsInScala.scala.html
	conf/application.conf
	conf/routes
	project/Build.scala

cheeseng/scalatest-website,scalatest/scalatest-website,jedesah/scalatest-website,scalatest/scalatest-website