Separate specs for conflicting changes