working without errors again
working without errors, fixing merge
trying to fix swap and merge
maybe fixing merge