Merged back the overwritten changes by others