Resolving conflict | salmondlibraryserv