Fixed manifest merge conflict
Updated dependencies