develop-master CONFLICT fixing manual add.