Removed conflicting state