change codekit settings
add more deets
resolve conflict