Corrected version file after merge