fixed merge conflict in backend