added hotfixes
resolved conflict