edit profile no longer crashes
merge conflict resolved
fixed bug