merge file
small changes