Add basic workflow and merge strategy