poprawiony parser
merge with resolving conflict