Elliot saccucci. Sourcetree resolve conflicts mine vs theirs. Sam holister lpsg. Flights from balikpapan to osaka.