updated bugs
updated bugs
updated bugs
fixed merge conflict