fixed test for merge changes