Commit um conflict vorzubeugen