merging files
savebin
fixed conflicts