Fixing incrementing on deck ids.
Fix merge conflicts while merging final_touches into master