Add variable typing on method
resolve conflict