bugfix updated
fixed function 2
resolved conflicts