fixed issues from git merge conflict. Profile and Edit working