some commits to fix my merge conflicts