Views building after rebase