[LAB1] Fixed conflict