bugFix - merge problems