Maybe removing it before merging ?