fixed bugs
fixed conflict