takes care of corrupted JSON files, adds the eror message to dynamic properties
resolved merge conflicts