fixed merge?