Made Squashes more interesting
Fixed Conflicts