Skip links

conflict resolution