Updated dependencies and improved conflict resolution