Github user AhyoungRyu commented on the issue:
https://github.com/apache/zeppelin/pull/1135
@davidtzoor Oh sorry for my late response. Did you fetch the latest version
of upstream `master`?
```
git checkout master
git fetch upstream
git pull upstream master
```
Then check `git log` in your local and compare with [this
page](https://github.com/apache/zeppelin/commits/master).
If those two have same history, you need to rebase with this status
```
git checkout forcelayout
git rebase master
```
then try to fix the conflict.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
