Removed conflict head and tail lines