"fixed merge conflicts"