fixed angry arrows from bad merge