Add a conflict for conflicts sake