Documentation for controllers is done
resolved conflicts