Fix merge conflict from last commit