Improved local object deleted solver to react on remote changes
Fixed local object renamed solver
Implemented basic conflict solver for local object deleted and remote changed
Added integration test for conflict situation of local deletion and remote change