Fixes merge conflicts in Develop and Package.json