Make format clearer with multiple merge conflicts

Really small