fix merge issues in applications.py