removed conflict output