variable file changed
variable file changed and merged conflict changed