testing merge
conf resolved