fixed steps
merging files