Added local middle line
Second conflic solved