Removed merge conflict from setup file
Fixed merge conflig in template