fixing links
fixing links merge