test2 altered locally
conflict solved