Fix fw parser bug
Resolve conflict