more work to finish merge