Fixed conflicting file after rebase