bumped version
fixed infinite loop when automatically resolving conflicts + small fixes