Removed options that won't be used in the actual competition
Fixed some merge conflics.