Delete development.log.conflict

delete de development.log.conflict