[***] fix all merge issues