updated sublime settings
resolved conflict