merging with user controller feature
after build