prev commit mistake in merging rectified