boss merge fix