GitHub repository: AbdullahMahmood68/Lab-07
Description: This is about conflicting branches