CAAERS-6869 resolving merge conflicts