fix merge issues in config xml

Change-Id: Ia776504156cb7817f983833e34d4b81cc7399e85