Fixed views after merge conflict.