Encountered one merge conflict which was the Athena Version file.
cc @nstyles @elmsheus @fwinkl @tamartin