updated repo a bit.
fixed conflict