Corrected one function when merged