fixing merge conflict which broke the website