merge fix + clean