Fixed merge conflicts on web server machine