merge johnnyslt