Resolve merge conflict due to full sync patch