small updates
fixed merge conflict