Merge user devise

early merge stuff