resolving_conflicts4
issue15_v2