Trying to fix that problem
resolving conflicts: