tired of this conflicting with git