Fix merge conflict in Berksfile