BRANCH master:
  removed conflicted lines