why are my changes not showing up in GitHub?
readme modified
resolved merge conflicts