mergeing error fix; application test fix