Fix merge pt2