removed conflicts
changed header title