Fixed mistakes during merge