merged locations app into concepts app