Fix button problem
fix merge conflicts