adding more links
resolving conflicts