removed merge errors
sitecontroller changed