moved / merge fix