removed superfluous content before merging