Kind of fixing the merge conflict