fixed bugs
fixed merge