better commit: "merge finished!!"
resolving conflicts