Fix merge
Another merge fix