Remove errors produced in the merge
Create the Confing variable REMOTE_CONF_VAR
Create the Confing variable REMOTE_CONF_VAR