Added middle line local
Solved conflict