committing changes made on the server. Looks like button ids were changed (likely due to conflict)
Merge remote branch 'origin/master'