local changes
pdf conflict
resolve conflict
CLiCs to CLICS in Intro and Conclusion