issue after merge resolved