fixed test
fixed merge issues