Add validate file format
Resolve conflict