fixed issue with clicking buttons
fixing merge conf