changes first line again
fixes merge conflicts