parsed data from .json file
fix conflicts