Fix Conflicts with Juliard