Select User finished
Merge conflict on Schema.rb solved
start user_weight
User weight feature started