add stored procs
resovle conflicts