Resolve merge error

Remove duplicated/old info