first documentation
conflicts fixed 1