Moving back to original rospack after merge