unfinished nixwork
fixed conflict
finish work- join room