errors_visualforce
fixing merge conflict