Merge "remove warning"