animation progress
remove old anchor
remove conflicts, merge