Fix merge conflict. #132