merged the changes, that were hotfixed before into git