Fix merge conflict
Merge pull request #10 from NextFaze/feature/2

Fix clipping on view animation