Fixed conflict

Fixed conflict & commented out media quiery