If you do a pull (or fetch and merge) on latest master, you will get a conflict on the scons_local submodule. The solution is to remove the scons_local directory before pulling it
Other than that, you should not have any issues. The files in that submodule have been placed in utils/sl.
