I'm not able to access files of module 2

[rics]

After this my files are not updated

[amanagar]

Use ls command to check

[rics]

i dont understand where the files are to resolve merge conflict