fixed bugs
merge