Changed Merge-Errors

-Fixed all errors related to the last merge