Fixed the failure in resolving the previous conflict.