Apply merge with CRUD-area-campus done by GHWC

github client's merge returns error but all merges are applied but one
file is not merged correctly (merged the file including its own
comments)