fixing merge problem - error when parsing file