fix solve conflict gitnya -_-