modify alignment
resolve conflict on header