Removed merge markers
Removed old animation stuff
Fixed position