getting buildIn merges working again and now for sails-linker too