premerge commit
fixed merge conflict and several errors