deleted wrong file
merging conflicts
added controllers