Fixing merge conflict in testing config