Efforts made to rectify merge issues.