Unbreak script, removing merge conflict