Settings API removed & conflict Resolved