Fixed after merge clash