Hopefully merge fix