merge is confusing