Got read of un-needed links and fixed conflicts.