Resolving conflicts with last commit