missed conflict
fix spinner