fix all to delete
resolve conflicts - merge to master