Stashing changes for now
Merged, most likely
Fixed merging