[LAB1] README updated, fix conflict