Fixing user image issue
Fix merge conflict