changes for user
fixing schema conflict