working on watch system
fixing vendor build path
fixing merge conflicts