TVHeadend merge conflict