instruction modified
merge fixed