commit before pull
Fixing merge confict
added user identification with devise