Add line stations
Resolve merge conflict