merged a conflict from the version running on the CLSP grid