Remove remnants of conflict resolution and fixed music.md markdown