fixing merge conflict in dynamic LES GPU code