finish passing tests for merge command