Corrected mistakes during merge