fixing bad merge for sublimetext