Conflicts on commit solved :)