Merged conflicts in site.tml