Fixed merging errors, older paperjs version