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