fixed users controller merge problems