fixed broken app during merge