Fixed the merge conflict in this branch as well