Renamed locomotive(s) references to developer(s)
Solved merge conflicts and removed redundant files