file deletion
merge conflicts