fixing some files
fixed merging conflicts