No I can not. As commented below it can not be automatically merged. I've taken a look at your changes and it seems they are mainly in conflict with 9ae750a5a422926ad593dd9ac55a35f6e97480a4. Please first solve those conflicts, then I will merge your code.