The merging created one weird synthax error. I removed it.