# Ignore version on merge
version.json merge=ours