CON-1396 | fixing merge conflicts