Merge with shaarli