Changed Project Database
Fixed project database merge issues