minor test before udpate to sclocal store
merge conflict