fixed merge  issue in applications