quick commit
fixed merge