colored arrow tweaks
fix merge conflict