Added more stuffmore
Making a conflict
Fixed the merge'