some error message
fixed conflict
fixed and added position of units