Fix previous commit which introduced file conflicts