Applications merge fixed