fixed merge conflict better