made conflict2
homework1