merge foo with develop