Gh 303 merge

enable a clean merge