added lines to test
fixed merge conflicts