pre merge fix