Resolve merge issues