resolve merge error in header