[LAB1] READMED updated, fix conflict again