And now that merge conflicts are gone... the changes are back...