#23: Resolve merge conflict re: tag verison