Updates and conflict fixes