third merge fix