added delete flag
merge conflict