I added new line in engineer haurko list
I resolved the conflict file