added erb to profile page
resolve merge conflict