Fixed the merge conflict, nothing fancy...