changed a few lines of testmerge