solved conflict 2