final logic?
merge fix