Delete development.log.conflict