preventing unnecessary requests
fix conflict