Add missing fields for appuration
Fix all conflicts