added line 6
resolve confict