[TASK] merge brances