resolved previous conflict