Fixed merge error on profile page