some post-merge changes done