init
fixed merge error