add button changes conflict with new files resolved