Finishing up clean up and making changelog reset to lessen conflicts