Merge fixes

A test