Add line stations
Fix merge conflict