Baphomet was an entity the church admitted to making up in order to persecute the templars. This history is important because the templars were christians, so the pope and co at the time needed to twist the image of the "God they worshipped". So Baphomet CAN be viewed as a fusion of the two, but that is not the most accurate description.