fixing conflicts
merge
fixinx receiver
fininshing simulator