Fixed merge conflict errors in style sheet, begin edit profile form.