HOME-Button: fix merging errors