load project in IDEA
git merge