began animations and merge
merge conflicts