removed merge conflict in packages file