Fix merge conflict in content.scala