algo changed
merge manually