my commits
conflict resolved
fix user controller