trying to fix snaps
merging