added line
reverted file
just did reset head^
merged in master