fixed some unidetified merge errors