made edit projects buttons
slove merge conflict