added a return
project edit and delete fixed
nothing
fixed conflict