fixed merge`s mistakes