Fixed leaves issues
fixed conflict