Merge branch 'master' of C:\Users\Mohamed\Desktop\New Folder\PXTR with conflicts.
Select, Delete , Insert , update is done for Category