Changed behavior of include to throw conflict exceptions