commit init
fixed merge