campanas json
merge conflic