Add possibility of having ranked computation, and fix git conflict headers