fixing fixed merge conflicting conflicts