changed conflict line partialy
resolved conflict