building fine, before team meeting
merging
xml changed