merge linkingEnds and master and added currentRank
fixing merge errors