add a change to test merges and checkout