committing my changes to avoid merge conflicts