fixed merge issues in all.launch