bjarv's shit
fixed conflict first