; (B) in section 2 by inserting or as otherwise provided in chapter 4 before the period at the end; (C) in section 208— (i) in the section heading, by striking Chapter 1; residual application and inserting Application ; and (ii) by adding at the end the following: This chapter applies to the extent that this chapter is not in conflict with chapter 4. ; and (D) in section 307— (i) in the section heading, by striking Chapter 1; residual application and inserting Application ; and (ii) by adding at the end the following: This chapter applies to the extent that this chapter is not in conflict with chapter 4. . (2) Table of sections (A) Chapter 2 The table of sections for chapter 2 of title 9, United States Code, is amended by striking the item relating to section 208 and inserting the following: 208. Application. . (B) Chapter 3 The table of sections for chapter 3 of title 9, United States Code, is amended by striking the item relating to section 307 and inserting the following: 307. Application. . (3) Table of chapters The table of chapters of title 9, United States Code, is amended by adding at the end the following: 4. Arbitration of servicemember and veteran disputes 401 . 4. Limitation on waiver of rights and protections under servicemembers civil relief act (a) Amendments Section 107(a) of the Servicemembers Civil Relief Act ( 50 U.S.C. 3918(a) ) is amended— (1) in the second sentence, by inserting and if it is made after a specific dispute has arisen and the dispute is identified in the waiver before the period at the end