Manually merged commit