Ajax Pre-req checking
Fix conflict