Add line to resolve conflicts.