Added ;
fixed conflicts
recover function added
merge done
merge got fuxxed
Merge fix