added crud and fixed merge error