Conflict was resolved in 4.3.