Added new local line
Confilct resolved