merging files
fixing merge errors