-merge fixed