Syrian opposition dispute resolved