test of downstream editing and merge conflicts