modified hej, add new file
fixed merge