fix bad conflict resolution, include uiauto bootstrap when launching ins...

...truments