fix implicit conflict