fixed bugs
resolved conflict