merge commit
merge commit
added a zoom animation