Code veranderd na kut Merge