removed conflict in site controller