starting development branch
merging development branch
Mergovanje
petljancija
resolving conflicts