deleted unused/conflicted files