resolve merge mess