modified
merge is completed