initial documentation
fixed conflict