changed conflict line partialy