Fixed the conflict issue with codekit-config.json
Fixed the conflict issue with codekit-config.json

joshdcomp/a_story_about_us,joshdcomp/a_story_about_us,MTTHWBSH/a_story_about_us,MTTHWBSH/a_story_about_us