still making a conflict