Removed some options causing conflicts on older versions of git