FYI This should [1] merge cleanly

1. not guaranteed to merge cleanly. :P