minor changes
merge conlict resolution
a few comments
merge conflicts
merge conflicts, hopefully last commit
master finale
merge fix