End Chapter 6
End Chapter 6
committing gemlock
to solve conflict