fix merging bugs
tiket:2 dell check for host