Added Json Column
merge conflict resolution for cloc and dot method calls