Resolved delete-update conflicts to update