removed case conflicted shit
update for linux