Fix merge conflicts

Hope this one works!