new file by hs
fixed merged conflicts with a human brain