Changes to parllax
Stashing
Merging
MErging Crft