Git training activities
Activity 3 conflict line: Alec resolved the branch one and branch two changes.