Setup header
Fixed merge conflicts