igore private.xml

ignore
private.xml
resolve confict