fixed merge conflics