binary merges
fixes