fixed conflict
fixed conflict
added shit