starting 1200000-1400000, and delete accidental scp folder
fix merge conflicts