Add number of merge conflicts and add local for function variables