Properly fixed merge conflict