Trying again ...

Why is this in master with merge conflicts?