animations done
merge with remote
merge conflict resolved