Conflict resolved when taking latest