rake db:populate fails due to avatar. Commented out lines to keep development cycle running
fixed merge conflict in user
fixed all conflicts