added atlas count to header
fixed a merge error