User:X-Savitar/Sub-pages/Manual rebase and merge conflict fix