Kyrgyz rivals strike deal on constitution wrangle