Change to library file
resolved conflicts