fixed conflicture problems

fixed conflict problems and changed constructor calls